Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 01:04:05 +0000 (17:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 01:04:05 +0000 (17:04 -0800)

Trivial merge